From f291474c50f9a6968872c42c20e1674321b884e7 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 23 May 2006 08:20:30 +0000 Subject: [PATCH] Allow absolute filenames in filename entry. Patch from Yevgen Muntyan 2006-05-23 Alexander Larsson * gtk/gtkprinteroptionwidget.c (filesave_changed_cb): Allow absolute filenames in filename entry. Patch from Yevgen Muntyan (#341679) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtkprinteroptionwidget.c | 9 ++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70248c40a6..9a78450bb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-23 Alexander Larsson + + * gtk/gtkprinteroptionwidget.c (filesave_changed_cb): + Allow absolute filenames in filename entry. + Patch from Yevgen Muntyan (#341679) + 2006-05-23 Alexander Larsson * gtk/gtk.symbols: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 70248c40a6..9a78450bb5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-05-23 Alexander Larsson + + * gtk/gtkprinteroptionwidget.c (filesave_changed_cb): + Allow absolute filenames in filename entry. + Patch from Yevgen Muntyan (#341679) + 2006-05-23 Alexander Larsson * gtk/gtk.symbols: diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c index 440b873a1d..37c1f57d4c 100644 --- a/gtk/gtkprinteroptionwidget.c +++ b/gtk/gtkprinteroptionwidget.c @@ -420,7 +420,14 @@ filesave_changed_cb (GtkWidget *w, directory = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (priv->combo)); file = gtk_entry_get_text (GTK_ENTRY (priv->entry)); - value = g_build_filename (directory, file, NULL); + if (g_path_is_absolute (file)) + value = g_strdup (file); +#ifdef G_OS_UNIX + else if (file[0] == '~' && file[1] == '/') + value = g_build_filename (g_get_home_dir (), file + 2, NULL); +#endif + else + value = g_build_filename (directory, file, NULL); if (value) gtk_printer_option_set (priv->source, value); -- 2.30.2